This repository has been archived by the owner on Nov 1, 2020. It is now read-only.
Implement ldvirtftn in shared generic contexts #2339
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Dependency analysis was incorrectly assuming these have their own dictionary (they don't).
|
Cc @mikedn |
davidwrighton
suggested changes
Dec 14, 2016
| public override ISymbolNode GetTarget(NodeFactory factory, Instantiation typeInstantiation, Instantiation methodInstantiation) | ||
| { | ||
| MethodDesc instantiatedMethod = _method.InstantiateSignature(typeInstantiation, methodInstantiation); | ||
| return factory.ReadyToRunHelper(ReadyToRunHelperId.VirtualCall, instantiatedMethod); |
There was a problem hiding this comment.
Put in a comment describing why this shouldn't be here... Something like, the function pointer returned should be the result of the virtual dispatch, not a pointer to the virtual dispatcher.
| @@ -2683,23 +2683,33 @@ private void getCallInfo(ref CORINFO_RESOLVED_TOKEN pResolvedToken, CORINFO_RESO | |||
| (void*)ObjectToHandle(_compilation.NodeFactory.ReadyToRunHelper(ReadyToRunHelperId.ResolveGenericVirtualMethod, targetMethod)); | |||
| pResult.nullInstanceCheck = false; | |||
| } | |||
| else if ((flags & CORINFO_CALLINFO_FLAGS.CORINFO_CALLINFO_LDFTN) != 0) | |||
| else | |||
There was a problem hiding this comment.
This changes the structure to fold together the virtual and non-virtual dispatch paths. While that is a simplification for now(since we only have R2R codegen), it is not in touch with longer term direction where we'll want to have more optimized codegen that handles the various cases in the most optimal form.
This was referenced Dec 14, 2016
|
@dotnet-bot test this please |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is to unblock #2308.
Requires JIT changes from dotnet/coreclr#8608.
This is two commits: first one is a bugfix uncovered by #2308. The second implements a missing feature required to support ldvirtftn in shared generic context.
I'm also restricting the number of cases when we actually need a generic lookup to calls/ldftn of interfaces and generic virtual methods. Normal virtual method calls/ldvirtfn go through the vtable slots that are the same between various canonically equivalent instantiations and don't need a runtime lookup.
On Project N, generic dictionaries point to the interface dispatch cell. The process of invoking/loading-the-address-of an interface method consists of a generic lookup for the interface dispatch cell, followed by a call to RhpResolveInterfaceMethod. This doesn't map great to what RyuJIT does (generic lookup followed by "mov rcx, this / call resultOfGenericLookup"). I'm making the dictionary point to a stub to do the dispatch for now. This has obvious delegate equivalency problems. I'll be filing an issue for the feature work to fix this.